Remove the /var/games/emacs directory to avoid a conflict with other flavors.

diff --git a/debian/changelog b/debian/changelog
index b3c7f4f29e865dfa150e132b6e8d4e9dd588937f..1098535d4c26c8c6f32d47dc6b13cc9b96721504 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,11 @@ emacs22 (22.1+1-1) unstable; urgency=low
 
   * Add desktop file for emacs22-gtk. (closes: #424069) [rlb]
 
- -- Rob Browning <rlb@defaultvalue.org>  Wed, 04 Jul 2007 23:42:12 -0700
+  * Remove /var/games/emacs/ since Emacs doesn't use it unless
+    update-game-score is setuid and Debian's isn't.
+    (closes: #423948, #430533) [rlb]
+
+ -- Rob Browning <rlb@defaultvalue.org>  Wed, 04 Jul 2007 23:44:55 -0700
 
 emacs22 (22.0.99+1-1) experimental; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 8ef8f22e84f240b0030c56c9a26c6744e3ae634c..ebad6c28b965efc7aa562a69767bf864aee0a863 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -735,6 +735,15 @@ install: debian/stamp/build $(autogen_install_files)
        rm $(pkgdir_common)/usr/share/info/emacs-$(major_ver)/dir
        rm $(pkgdir_common)/usr/share/info/emacs-$(major_ver)/dir.old
 
+        # Remove the shared game score directory to as a simple way to avoid
+        # a conflict with other flavors of Emacs.  Since Debian's
+        # update-game-score binary isn't setuid, that directory is never used.
+       rm $(pkgdir_common)/var/games/emacs/tetris-scores
+       rm $(pkgdir_common)/var/games/emacs/snake-scores
+       rmdir $(pkgdir_common)/var/games/emacs/
+       rmdir $(pkgdir_common)/var/games/
+       rmdir $(pkgdir_common)/var/
+
         # Make sure /usr/local dir doesn't exist.
        rm -r $(pkgdir_common)/usr/local